From: awilliam@xenbuild.aw <awilliam@xenbuild.aw>
Date: Sun, 22 Oct 2006 21:23:52 +0000 (-0600)
Subject: merge with xen-unstable.hg
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15589
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=b5f74534ce21555b1aaf0d3612a654b86cc1dcd5;p=xen.git

merge with xen-unstable.hg
---

b5f74534ce21555b1aaf0d3612a654b86cc1dcd5
diff --cc unmodified_drivers/linux-2.6/mkbuildtree
index 9e2803cd77,be6b1a6d94..ce0a142447
--- a/unmodified_drivers/linux-2.6/mkbuildtree
+++ b/unmodified_drivers/linux-2.6/mkbuildtree
@@@ -30,31 -37,26 +38,30 @@@ ln -sf ${XEN}/include/public include/xe
  case "$uname"
  in
  "x86_64")
- 	ln -sf ${XL}/include/asm-x86_64/mach-xen/asm/hypervisor.h include/asm
- 	ln -sf ${XL}/include/asm-x86_64/mach-xen/asm/hypercall.h include/asm
- 	ln -sf ${XL}/include/asm-x86_64/mach-xen/asm/synch_bitops.h include/asm
- 	ln -sf ${XL}/include/asm-x86_64/mach-xen/asm/maddr.h include/asm
- 	ln -sf ${XL}/include/asm-i386 include/asm-i386
- 	;;
+     ln -sf ${XL}/include/asm-x86_64/mach-xen/asm/hypervisor.h include/asm
+     ln -sf ${XL}/include/asm-x86_64/mach-xen/asm/hypercall.h include/asm
+     ln -sf ${XL}/include/asm-x86_64/mach-xen/asm/synch_bitops.h include/asm
+     ln -sf ${XL}/include/asm-x86_64/mach-xen/asm/maddr.h include/asm
+     ln -sf ${XL}/include/asm-i386 include/asm-i386
+   ;;
  i[34567]86)
- 	ln -sf ${XL}/include/asm-i386/mach-xen/asm/hypervisor.h include/asm
- 	ln -sf ${XL}/include/asm-i386/mach-xen/asm/hypercall.h include/asm
- 	ln -sf ${XL}/include/asm-i386/mach-xen/asm/synch_bitops.h include/asm
- 	ln -sf ${XL}/include/asm-i386/mach-xen/asm/maddr.h include/asm
- 	;;
+     ln -sf ${XL}/include/asm-i386/mach-xen/asm/hypervisor.h include/asm
+     ln -sf ${XL}/include/asm-i386/mach-xen/asm/hypercall.h include/asm
+     ln -sf ${XL}/include/asm-i386/mach-xen/asm/synch_bitops.h include/asm
+     ln -sf ${XL}/include/asm-i386/mach-xen/asm/maddr.h include/asm
+   ;;
  "ia64")
- 	ln -sf ${XL}/include/asm-ia64/hypervisor.h include/asm
- 	ln -sf ${XL}/include/asm-ia64/hypercall.h include/asm
- 	ln -sf ${XL}/include/asm-ia64/synch_bitops.h include/asm
- 	ln -sf ${XL}/include/asm-ia64/maddr.h include/asm
- 	ln -sf ${XL}/include/asm-ia64/xen/xcom_hcall.h include/asm/xen
- 	ln -sf ${XL}/include/asm-ia64/xen/xencomm.h include/asm/xen
-  	ln -sf ${XL}/arch/ia64/xen/xcom_mini.c platform-pci
-  	ln -sf ${XL}/arch/ia64/xen/xencomm.c platform-pci
- 	;;
+     ln -sf ${XL}/include/asm-ia64/hypervisor.h include/asm
+     ln -sf ${XL}/include/asm-ia64/hypercall.h include/asm
+     ln -sf ${XL}/include/asm-ia64/synch_bitops.h include/asm
+     ln -sf ${XL}/include/asm-ia64/maddr.h include/asm
++    ln -sf ${XL}/include/asm-ia64/xen/xcom_hcall.h include/asm/xen
++    ln -sf ${XL}/include/asm-ia64/xen/xencomm.h include/asm/xen
++    ln -sf ${XL}/arch/ia64/xen/xcom_mini.c platform-pci
++    ln -sf ${XL}/arch/ia64/xen/xencomm.c platform-pci
+   ;;
  *)
- 	echo unknown architecture $uname
- 	exit 1
- 	;;
+     echo unknown architecture $uname
+     exit 1
+   ;;
  esac